prepare-root: Fix compilation with --with-static-compiler

Closes: https://github.com/ostreedev/ostree/issues/1845
Closes: #1846
Approved by: akiernan

diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am
index 586a8cd5c24413fedd5c9c37d066bfc5c097780e..ff44d4bc3981ead1592415404bf66ced2046a0b0 100644 (file)
--- a/Makefile-switchroot.am
+++ b/Makefile-switchroot.am
@@ -45,7 +45,7 @@ if BUILDOPT_USE_STATIC_COMPILER
 ostree_boot_SCRIPTS = ostree-prepare-root
 
 ostree-prepare-root : $(ostree_prepare_root_SOURCES)
-       $(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root.c $(ostree_prepare_root_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES)
+       $(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root.c $(ostree_prepare_root_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) -DOSTREE_PREPARE_ROOT_STATIC=1
 else
 ostree_boot_PROGRAMS += ostree-prepare-root
 ostree_prepare_root_CFLAGS = $(AM_CFLAGS) -Isrc/switchroot

diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
index c4208750b65e9ad3602f87687a737f75d4adc0f2..15d49963b47aa3f595c97e0cf4ea9937a2de365b 100644 (file)
--- a/src/switchroot/ostree-prepare-root.c
+++ b/src/switchroot/ostree-prepare-root.c
@@ -47,7 +47,11 @@
 #include <errno.h>
 #include <ctype.h>
 
-#ifdef HAVE_LIBSYSTEMD
+#if defined(HAVE_LIBSYSTEMD) && !defined(OSTREE_PREPARE_ROOT_STATIC)
+#define USE_LIBSYSTEMD
+#endif
+
+#ifdef USE_LIBSYSTEMD
 #include <systemd/sd-journal.h>
 #define OSTREE_PREPARE_ROOT_DEPLOYMENT_MSG SD_ID128_MAKE(71,70,33,6a,73,ba,46,01,ba,d3,1a,f8,88,aa,0d,f7)
 #endif
@@ -79,7 +83,7 @@ resolve_deploy_path (const char * root_mountpoint)
   if (stat (deploy_path, &stbuf) < 0)
     err (EXIT_FAILURE, "stat(%s) failed", deploy_path);
   /* Quiet logs if there's no journal */
-#ifdef HAVE_LIBSYSTEMD
+#ifdef USE_LIBSYSTEMD
   const char *resolved_path = deploy_path + strlen (root_mountpoint);
   sd_journal_send ("MESSAGE=Resolved OSTree target to: %s", deploy_path,
                    "MESSAGE_ID=" SD_ID128_FORMAT_STR,